Navigation and highlighting improvements #2377

harshad1 · 2024-07-29T06:22:22Z

This adds several improvements to file browsing and navigation

Better handling + fixes to handling of special / virtual folders
back goes to previous folder (needs to be refined more). Addresses Back button should return to the previous directory instead of the parent directory #2337
Fixed activity back-stack and link navigation

Todo:

Fix file dialog subtitle padding and truncation
Back should ask before closing markor

I have also added other things to this PR now

Highlighting happens in a separate thread making it less janky when typing fast (especially in very long todo lists)
We had a lot of code which did not check if selection was invalid - added defensive logic everywhere
Several cleanups
Remember share into format as link state from last time

app/src/main/java/net/gsantner/markor/model/AppSettings.java

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java

harshad1 · 2024-07-29T06:27:54Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java

        loadFolder(_dopt.startFolder != null ? _dopt.startFolder : _dopt.rootFolder, null);
    }

+    public Map<File, File> getVirtualFolders() {


Populate virtual folders at start

can't find the issue, but I recall there being topics about virtual lists not outdated

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java

…ovements

app/src/main/java/net/gsantner/markor/frontend/textview/SyntaxHighlighterBase.java

app/src/main/java/net/gsantner/markor/model/Document.java

app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java

harshad1 · 2024-08-23T17:59:01Z

app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java

@@ -224,7 +224,7 @@ protected void afterOnCreate(Bundle savedInstances, Context context) {
            if (_editor != null && _linkCheckBox != null) {
                doUpdatePreferences();
                _linkCheckBox.setVisibility(hasLinks(_editor.getText()) ? View.VISIBLE : View.GONE);
-                _linkCheckBox.setChecked(true);
+                _linkCheckBox.setChecked(_appSettings.getFormatShareAsLink());


Remember share option

harshad1 · 2024-08-23T18:00:21Z

app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java

@@ -474,36 +474,48 @@ public static void runRegexReplaceAction(final Editable editable, final ReplaceP

    private static void runRegexReplaceAction(final Editable editable, final List<ReplacePattern> patterns) {

-        TextViewUtils.withKeepSelection(editable, (selStart, selEnd) -> {


Got rid of this method - we use it rarely and it replaces 3 lines of code

harshad1 · 2024-08-23T18:09:54Z

app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java

-        TextViewUtils.withKeepSelection(editable, (selStart, selEnd) -> {
+        final int[] sel = TextViewUtils.getSelection(editable);
+        if (sel[0] < 0) {
+            return;


sel[0] < 0 means invalid / no selection.

We were not testing for this which means actions were likely silently failing. Added these tests

harshad1 · 2024-08-23T18:11:34Z

app/src/main/java/net/gsantner/markor/model/Document.java

-        _title = GsFileUtils.getFilenameWithoutExtension(_file);
-        _fileExtension = GsFileUtils.getFilenameExtension(_file);
+    public Document(@NonNull final File f) {
+        path = getPath(f);


We should use the canonical path always. Absolute path can include ../

harshad1 · 2024-08-23T18:12:28Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java

@@ -299,4 +318,30 @@ public void onStart() {
            w.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
        }
    }
+
+    private static void setSubtitleApprearance(final Toolbar toolbar) {


Find and set a dialog subtitle appearance. This is a little hacky but it works correctly every time.

harshad1 · 2024-08-28T23:00:56Z

@gsantner Do you know why this build is failing?

gsantner · 2024-08-29T20:47:18Z

Seems that either a repository went down under, or GitHub actions has network issues (which also happens from time to time). It would be weird if suddenly two libraries would go to nirvana on it's own.

Could not resolve all files for configuration ':app:flavorDefaultDebugRuntimeClasspath'.
Failed to transform library-1.1.8.aar (com.pixplicity.generate:library:1.1.8) to match attributes {artifactType=android-aar-metadata, org.gradle.category=library, org.gradle.libraryelements=jar, org.gradle.status=release, org.gradle.usage=java-runtime}.
> Could not find library-1.1.8.jar (com.pixplicity.generate:library:1.1.8).
Searched in the following locations:
https://jcenter.bintray.com/com/pixplicity/generate/library/1.1.8/library-1.1.8.aar
https://jcenter.bintray.com/com/pixplicity/generate/library/1.1.8/library-1.1.8.jar
Failed to transform om-recorder-1.1.5.aar (com.kailashdabhi:om-recorder:1.1.5) to match attributes {artifactType=android-aar-metadata, org.gradle.category=library, org.gradle.libraryelements=jar, org.gradle.status=release, org.gradle.usage=java-runtime}.
> Could not find om-recorder-1.1.5.jar (com.kailashdabhi:om-recorder:1.1.5).
Searched in the following locations:
https://jcenter.bintray.com/com/kailashdabhi/om-recorder/1.1.5/om-recorder-1.1.5.aar
https://jcenter.bintray.com/com/kailashdabhi/om-recorder/1.1.5/om-recorder-1.1.5.jar

harshad1 · 2024-09-04T19:12:48Z

Also now included are fixes for the build failing.

@gsantner this is ready to merge

gsantner · 2024-09-16T20:33:10Z

app/build.gradle

    implementation 'com.github.AppIntro:AppIntro:6.2.0'
-    implementation 'com.kailashdabhi:om-recorder:1.1.5'
+    implementation 'com.github.kailash09dabhi:OmRecorder:1.1.5'
    implementation 'com.github.mertakdut:EpubParser:1.0.95'
    implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.1.0'


Thank you for checking the new installation options and fixing it

gsantner · 2024-09-16T20:34:44Z

Thanks, merging

…ntner#2409 closes gsantner#2410) * Many fixes to navigation and go back * Cleanups to fragment handling * Tweaks to showing keyboard * Final tweaks to activity stacks * Removed unnecessary 'synchronized' calls for perf * Tweaks to highlighting * Reverted some highlighting changes * Fix template cursor start * Improvements to display of file browser dialog / fragment * Initial set of changes for async * Using canonical paths and and static members * Defensive logic for indices * Batching fixup for reduced computation * Switching back to start end as it made no difference * Tweaks to launching; file paths -> canonical * Fixed wikitext link formatting (cherry picked from commit c5fe529)

harshad1 added 3 commits July 28, 2024 23:18

Many fixes to navigation and go back

a25a941

Revert name change

7de0995

Revert revert

8ea9255

harshad1 commented Jul 29, 2024

View reviewed changes

app/src/main/java/net/gsantner/markor/model/AppSettings.java Show resolved Hide resolved

harshad1 commented Jul 29, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java Show resolved Hide resolved

harshad1 commented Jul 29, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java Show resolved Hide resolved

harshad1 commented Jul 29, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java Show resolved Hide resolved

harshad1 commented Jul 29, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java Show resolved Hide resolved

harshad1 added 5 commits August 7, 2024 21:53

Cleanups to fragment handling

4bae533

Merge remote-tracking branch 'upstream/master' into file_browser_impr…

fafd54a

…ovements

Tweaks to showing keyboard

d987437

Final tweaks to activity stacks

c46d692

Removed unnecessary 'synchronized' calls for perf

4f5428a

harshad1 changed the title ~~WIP: Navigation improvements~~ Navigation improvements Aug 16, 2024

harshad1 commented Aug 16, 2024

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/SyntaxHighlighterBase.java Show resolved Hide resolved

harshad1 commented Aug 16, 2024

View reviewed changes

app/src/main/java/net/gsantner/markor/model/Document.java Show resolved Hide resolved

harshad1 commented Aug 16, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java Show resolved Hide resolved

harshad1 commented Aug 16, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java Show resolved Hide resolved

Cleanups

fdc484a

harshad1 changed the title ~~Navigation improvements~~ WIP: Navigation improvements Aug 16, 2024

harshad1 added 2 commits August 16, 2024 22:21

Tweaks to highlighting

c0e7b5c

Reverted some highlighting changes

587c005

harshad1 commented Aug 17, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java Show resolved Hide resolved

harshad1 commented Aug 17, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java Show resolved Hide resolved

harshad1 commented Aug 17, 2024

View reviewed changes

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java Show resolved Hide resolved

harshad1 added 4 commits August 17, 2024 10:48

More reverts

12ced96

Fix template cursor start

287c271

Improvements to display of file browser dialog / fragment

00eae25

Initial set of changes for async

092f22e

harshad1 commented Aug 23, 2024

View reviewed changes

harshad1 added 6 commits August 25, 2024 16:19

Tweaks

1ca5698

Batching fixup for reduced computation

0d037ef

Switching back to start end as it made no difference

c620feb

Yet more massaging spans for performance

6b1bc6c

Tweaks to reflow

3a2daaa

Tweaks and documentation

3738d2b

harshad1 changed the title ~~Navigation and other improvements~~ Navigation and highlighting improvements Aug 28, 2024

Tweaks to launching; file paths -> canonical

372d7b5

harshad1 mentioned this pull request Sep 4, 2024

WIP: Navigation improvements #2408

Closed

harshad1 added 2 commits September 4, 2024 11:58

Fixed deps

7cdb847

imports

2cdef58

Fixed wikitext link formatting

8c63366

This was referenced Sep 10, 2024

Sharing links from browser to Zim wiki notes #2409

Closed

Use a single process for the whole app #2410

Closed

gsantner added this to the Markor v2.13 milestone Sep 16, 2024

gsantner reviewed Sep 16, 2024

View reviewed changes

gsantner approved these changes Sep 16, 2024

View reviewed changes

This was linked to issues Sep 16, 2024

Sharing links from browser to Zim wiki notes #2409

Closed

Use a single process for the whole app #2410

Closed

gsantner merged commit c5fe529 into gsantner:master Sep 16, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Navigation and highlighting improvements #2377

Navigation and highlighting improvements #2377

harshad1 commented Jul 29, 2024 •

edited

Loading

harshad1 Jul 29, 2024

gsantner Aug 18, 2024

harshad1 Aug 23, 2024

harshad1 Aug 23, 2024

harshad1 Aug 23, 2024

harshad1 Aug 23, 2024

harshad1 Aug 23, 2024

harshad1 commented Aug 28, 2024

gsantner commented Aug 29, 2024

harshad1 commented Sep 4, 2024

gsantner Sep 16, 2024

gsantner commented Sep 16, 2024

		@@ -474,36 +474,48 @@ public static void runRegexReplaceAction(final Editable editable, final ReplaceP

		private static void runRegexReplaceAction(final Editable editable, final List<ReplacePattern> patterns) {

		TextViewUtils.withKeepSelection(editable, (selStart, selEnd) -> {

Navigation and highlighting improvements #2377

Navigation and highlighting improvements #2377

Conversation

harshad1 commented Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harshad1 commented Aug 28, 2024

gsantner commented Aug 29, 2024

harshad1 commented Sep 4, 2024

Choose a reason for hiding this comment

gsantner commented Sep 16, 2024

harshad1 commented Jul 29, 2024 •

edited

Loading